Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 14:37:16 +0000 (07:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 14:37:16 +0000 (07:37 -0700)
commit9f082eb3f40d29334216ac3ef7d37d75e72b2960
tree538239806b0fa486261bb14ecfaea2b746e3cffa
parent69e8dc940f0da5efa8eab03e2dbdc03b208e213b
parent815387a76ac0a137811fc5c543dc3edd7af46581
Merge from trunk.